Fix some compiler warnings. (#321141, Kjartan Maraas)

2005-11-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c: Fix some compiler warnings. (#321141,
	Kjartan Maraas)

diff --git a/ChangeLog b/ChangeLog
index 808906df6e9d7ca4e2c654d23a96133bc9f14e75..a624108933d72dad6777bac6642fa317b97774d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c: Fix some compiler warnings. (#321141,
+       Kjartan Maraas)
+       
        * gtk/gtk.symbols: 
        * gtk/gtktreeview.h: 
        * gtk/gtktreeview.c: Implement a getter for headers-clickable.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 808906df6e9d7ca4e2c654d23a96133bc9f14e75..a624108933d72dad6777bac6642fa317b97774d2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-11-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c: Fix some compiler warnings. (#321141,
+       Kjartan Maraas)
+       
        * gtk/gtk.symbols: 
        * gtk/gtktreeview.h: 
        * gtk/gtktreeview.c: Implement a getter for headers-clickable.

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 0722d8788c11b3c727705329a461633904f3ff2b..18a73fcd30d847a006a219d7a50444847c006391 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2193,7 +2193,7 @@ gtk_menu_size_request (GtkWidget      *widget,
     {
       gint part;
       gint toggle_size;
-      guint l, r, t, b;
+      gint l, r, t, b;
 
       child = children->data;
       children = children->next;
@@ -2322,7 +2322,7 @@ gtk_menu_size_allocate (GtkWidget     *widget,
          if (GTK_WIDGET_VISIBLE (child))
            {
               gint i;
-             guint l, r, t, b;
+             gint l, r, t, b;
 
              get_effective_child_attach (child, &l, &r, &t, &b);
 
@@ -3754,8 +3754,8 @@ compute_child_offset (GtkMenu   *menu,
                      gboolean  *is_last_child)
 {
   GtkMenuPrivate *priv = gtk_menu_get_private (menu);
-  guint item_top_attach;
-  guint item_bottom_attach;
+  gint item_top_attach;
+  gint item_bottom_attach;
   gint child_offset = 0;
   gint i;
 
@@ -4062,7 +4062,7 @@ find_child_containing (GtkMenuShell *menu_shell,
 
   for (list = menu_shell->children; list; list = list->next)
     {
-      guint l, r, t, b;
+      gint l, r, t, b;
 
       if (!_gtk_menu_item_is_selectable (list->data))
         continue;
@@ -4083,7 +4083,7 @@ gtk_menu_move_current (GtkMenuShell *menu_shell,
 {
   GtkMenu *menu = GTK_MENU (menu_shell);
   gint i;
-  guint l, r, t, b;
+  gint l, r, t, b;
   GtkWidget *match = NULL;
 
   if (gtk_widget_get_direction (GTK_WIDGET (menu_shell)) == GTK_TEXT_DIR_RTL)